From 9faed12426a7a6d60159d2ad926f6475c41fc26d Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Thu, 28 Jan 2021 09:18:37 -0700
Subject: [PATCH] tidy readability-const-return-type

with a little whitespace cleanup by hand and removal of an
unused deprecated function.
---
 defs.h           | 3 +--
 garmin_tables.cc | 2 +-
 garmin_tables.h  | 2 +-
 inifile.cc       | 2 +-
 mtk_logger.cc    | 2 +-
 util.cc          | 4 ++--
 waypt.cc         | 6 ------
 7 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/defs.h b/defs.h
index a6617f0f5..5eb339f5f 100644
--- a/defs.h
+++ b/defs.h
@@ -536,7 +536,6 @@ public:
 
   bool HasUrlLink() const;
   const UrlLink& GetUrlLink() const;
-  [[deprecated]] const QList<UrlLink> GetUrlLinks() const;
   void AddUrlLink(const UrlLink& l);
   QString CreationTimeXML() const;
   gpsbabel::DateTime GetCreationTime() const;
@@ -1118,7 +1117,7 @@ char* convert_human_date_format(const char* human_datef);	/* "MM,YYYY,DD" -> "%m
 char* convert_human_time_format(const char* human_timef);	/* "HH+mm+ss"   -> "%H+%M+%S" */
 char* pretty_deg_format(double lat, double lon, char fmt, const char* sep, int html);    /* decimal ->  dd.dddd or dd mm.mmm or dd mm ss */
 
-const QString get_filename(const QString& fname);			/* extract the filename portion */
+QString get_filename(const QString& fname);			/* extract the filename portion */
 
 /*
  * Character encoding transformations.
diff --git a/garmin_tables.cc b/garmin_tables.cc
index 9dc350b02..4b0c97f3a 100644
--- a/garmin_tables.cc
+++ b/garmin_tables.cc
@@ -421,7 +421,7 @@ gt_switch_display_mode_value(const unsigned char display_mode, const int protoid
   }
 }
 
-const QString
+QString
 gt_find_desc_from_icon_number(const int icon, garmin_formats_e garmin_format)
 {
   if ((garmin_format == GDB) && (icon >= 500) && (icon <= 563)) {
diff --git a/garmin_tables.h b/garmin_tables.h
index 0d0f24c95..1dbfa37d5 100644
--- a/garmin_tables.h
+++ b/garmin_tables.h
@@ -38,7 +38,7 @@ struct icon_mapping_t {
 
 enum garmin_formats_e {MAPSOURCE, PCX, GARMIN_SERIAL, GDB};
 
-const QString gt_find_desc_from_icon_number(int icon, garmin_formats_e garmin_format);
+QString gt_find_desc_from_icon_number(int icon, garmin_formats_e garmin_format);
 int gt_find_icon_number_from_desc(const QString& desc, garmin_formats_e garmin_format);
 
 extern const icon_mapping_t garmin_icon_table[];
diff --git a/inifile.cc b/inifile.cc
index 624f779ac..e529f86f5 100644
--- a/inifile.cc
+++ b/inifile.cc
@@ -148,7 +148,7 @@ inifile_load_file(QTextStream* stream, inifile_t* inifile, const char* myname)
   }
 }
 
-static const QString
+static QString
 inifile_find_value(const inifile_t* inifile, const QString& sec_name, const QString& key)
 {
   if (inifile == nullptr) {
diff --git a/mtk_logger.cc b/mtk_logger.cc
index 5e11dddbf..0c8bb9d76 100644
--- a/mtk_logger.cc
+++ b/mtk_logger.cc
@@ -303,7 +303,7 @@ static void dbg(int l, const char* msg, ...)
 //
 // It returns a temporary C string - it's totally kludged in to replace
 // TEMP_DATA_BIN being string constants.
-static const QString GetTempName(bool backup)
+static QString GetTempName(bool backup)
 {
   const char kData[]= "data.bin";
   const char kDataBackup[]= "data_old.bin";
diff --git a/util.cc b/util.cc
index 387b0057e..7564ed24e 100644
--- a/util.cc
+++ b/util.cc
@@ -1679,9 +1679,9 @@ QString xml_attribute(const QXmlStreamAttributes& attributes, const QString& att
   return QString();
 }
 
-const QString get_filename(const QString& fname)
+QString get_filename(const QString& fname)
 {
-  return  QFileInfo(fname).fileName();
+  return QFileInfo(fname).fileName();
 }
 
 /* bit manipulation functions */
diff --git a/waypt.cc b/waypt.cc
index ac38d57c8..0f8f918fe 100644
--- a/waypt.cc
+++ b/waypt.cc
@@ -521,12 +521,6 @@ Waypoint::GetUrlLink() const
   return urls.GetUrlLink();
 }
 
-[[deprecated]] const QList<UrlLink>
-Waypoint::GetUrlLinks() const
-{
-  return urls;
-}
-
 void
 Waypoint::AddUrlLink(const UrlLink& l)
 {
-- 
2.30.2